bitkeeper revision 1.390 (3f28e60en8ngkjURAmEySVpMK3U5PQ)

dev.c, perfc_defn.h:
  Little perfctr addition.

diff --git a/xen/include/xeno/perfc_defn.h b/xen/include/xeno/perfc_defn.h
index ad6eaaebf8d61ea87f45076c2fbfb34e884eed8b..2c53e8334d259c6a5e3819f78e10152804c63043 100644 (file)
--- a/xen/include/xeno/perfc_defn.h
+++ b/xen/include/xeno/perfc_defn.h
@@ -10,7 +10,8 @@ PERFCOUNTER_CPU( sched_run2,   "sched: runs through scheduler" )
 PERFCOUNTER_CPU( sched_ctx,    "sched: context switches" )
 
 PERFCOUNTER( net_hypercalls, "network hypercalls" )
-PERFCOUNTER( net_rx_capacity_drop, "net rx capacity drop" )
+PERFCOUNTER( net_rx_congestion_drop, "net rx congestion drops" )
+PERFCOUNTER( net_rx_capacity_drop, "net rx capacity drops" )
 PERFCOUNTER( net_rx_delivered, "net rx delivered" )
 PERFCOUNTER( net_rx_tlbflush, "net rx tlb flushes" )
 PERFCOUNTER( net_tx_transmitted, "net tx transmitted" )

diff --git a/xen/net/dev.c b/xen/net/dev.c
index a53136deaa2156475423e648d141f4555ec9e44a..54b73bbf0ab3758349469a6c5a7069b18fa8ec26 100644 (file)
--- a/xen/net/dev.c
+++ b/xen/net/dev.c
@@ -615,7 +615,7 @@ int netif_rx(struct sk_buff *skb)
     /* This oughtn't to happen, really! */
     if ( unlikely(skb_queue_len(q) > 100) )
     {
-        printk("Congestion -- packet dropped!!\n");
+        perfc_incr(net_rx_congestion_drop);
         return NET_RX_DROP;
     }